Skip to content

[stable-33.0] fix: Refactor visitedDirectory handling in MaterializedEnumerationObserver#10012

Merged
Rello merged 3 commits into
stable-33.0from
backport/10011/stable-33.0
May 8, 2026
Merged

[stable-33.0] fix: Refactor visitedDirectory handling in MaterializedEnumerationObserver#10012
Rello merged 3 commits into
stable-33.0from
backport/10011/stable-33.0

Conversation

@backportbot
Copy link
Copy Markdown

@backportbot backportbot Bot commented May 8, 2026

Backport of PR #10011

Rello added 3 commits May 8, 2026 18:06
…erver

visitedDirectory is what keeps a browsed folder in materialisedItemMetadatas() in FilesDatabaseManager.swift (line 591). That list drives checkMaterializedItemsOnServer() in Enumerator.swift (line 423). Preserving visitedDirectory means shared folders gets scanned again when its eTag changes, so the newly added child is discovered and reported.

Test change: update MaterialisedEnumerationObserverTests.swift (line 80) so an evicted directory remains visitedDirectory == true. The existing mixed-state test currently expects the opposite, and that expectation is the bug.

Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
Signed-off-by: Rello <Rello@users.noreply.github.com>
@backportbot backportbot Bot requested a review from Aiiaiiio as a code owner May 8, 2026 18:07
@backportbot backportbot Bot requested a review from i2h3 May 8, 2026 18:07
@backportbot backportbot Bot requested a review from Rello May 8, 2026 18:07
@backportbot backportbot Bot added bug os: 🍎 macOS Apple macOS, formerly also known as OS X 3. to review feature: 📁 file provider macOS File Provider Extension, more general also known as virtual file system. labels May 8, 2026
@backportbot backportbot Bot added this to the 33.0.5 milestone May 8, 2026
@github-actions
Copy link
Copy Markdown

github-actions Bot commented May 8, 2026

Artifact containing the AppImage: nextcloud-appimage-pr-10012.zip

Digest: sha256:71aa44eaf9d732d25d886264e712854866ed3ceec6ec0d67c13ef15846e7270f

To test this change/fix you can download the above artifact file, unzip it, and run it.

Please make sure to quit your existing Nextcloud app and backup your data.

@sonarqubecloud
Copy link
Copy Markdown

sonarqubecloud Bot commented May 8, 2026

Copy link
Copy Markdown
Collaborator

@i2h3 i2h3 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have one typo in one commit message which breaks the actions. 😆

@Rello Rello merged commit 770fde3 into stable-33.0 May 8, 2026
20 of 21 checks passed
@Rello Rello deleted the backport/10011/stable-33.0 branch May 8, 2026 20:52
@Rello
Copy link
Copy Markdown
Collaborator

Rello commented May 8, 2026

You have one typo in one commit message which breaks the actions. 😆

keyboard changed to VN randomly 🤷🏼

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to review bug feature: 📁 file provider macOS File Provider Extension, more general also known as virtual file system. os: 🍎 macOS Apple macOS, formerly also known as OS X

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants